[automerger skipped] Merge "DO NOT MERGE: Add size check on PPS#policy" into...

[automerger skipped] Merge "DO NOT MERGE: Add size check on PPS#policy" into rvc-dev am: 23a890a4 am: 472f9aa4 -s ours am: aaeb1e0f -s ours am: d2cab3ef -s ours am: 9aeabbdb -s ours

am skip reason: subject contains skip directive

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



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