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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee4826c66d5187608d0afa8f23fa45f1efe34a2b