Merge "Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf"
am: 292e9ca718

Change-Id: Ia0969668daea2c139a325763d757ccefd76ee34f