[automerger skipped] Merge "DO NOT MERGE: Add size check on PPS#policy" into rvc-dev am: 23a890a43f am: 472f9aa49e -s ours am: aaeb1e0f3e -s ours am: d2cab3ef87 -s ours am: 9aeabbdbe8 -s ours am: 81e8290649 -s ours am: 6e591a2348 -s ours

am skip reason: subject contains skip directive

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

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