Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" am: 7d72edb937

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bb97f5e7daffed6374b93926a908a8c2175bbcd