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

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



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