Merge "Doesn't meet 0p requirements. Can use 1p." am: 2718fc5c am:...

Merge "Doesn't meet 0p requirements. Can use 1p." am: 2718fc5c am: e354b826 am: f851a732 am: 65fb50bd am: 23d415d8

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



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