[automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the...

[automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-qpr-dev am: cd8ca037 -s ours am: ace29d1a -s ours am: 9311d2dd -s ours am: d6d9543d -s ours am: 9b6a6d8f -s ours am: ffa19755 -s ours

am skip reason: subject contains skip directive

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



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