Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" am: 7d72edb937 am: 0727d8d08c am: 2e26868923

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8913c209a8c3f6387e99a32184580a562870735