Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf am: e4c4e3e55a am: 0ac46bc583
am: aaf19bf9ce

Change-Id: I9b971fd3612e054f1349302d8b190f0b74f3cd00