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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ae1ef7ad7e45b0870c09f8e20875ffe3714f6c