[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-dev am: 1c93d677 -s ours am: 37739a5f -s ours am: 1975cbc9 -s ours am: eeca8de7 -s ours am: 5d89d687 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied58466898fd17a7a46b94b6a9c0152a7b4c72ef