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: Ib5a78547f2f2ebd5a11ed06f31f93ae2aa1fae59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>