Merge "Add config flag for OEM to control PbA" into tm-dev am: 90cd705e

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



Change-Id: I33581345a71f9c34f921368f8e6ef3c1e35ee4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>