Merge "Generalize some PANS methods" am: fcbc6ff6b1 am: b2bc755a59

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9203b1f45d072694bffad33f6e4e9d4b12185a4a