[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 qt-dev am: eeb7b808 -s ours am: a746ce4a -s ours am: 4fc54276 -s ours am: 707762ee -s ours am: d106257f -s ours am: 84376721 -s ours am: 63c61253 -s ours am: 97d433ae -s ours

am skip reason: subject contains skip directive

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

Change-Id: I718906fed50daf286e12bbc232bcc4f7a27b261b