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

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



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