Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9a6 am: 4d4af2bd05 am: b3ebae141f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675628

Change-Id: I08164c986c247fa36aa25afc533f9ad656ab8850