[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: 5acec9a2 -s ours am: f12fc4d5 -s ours am: 6d328177 -s ours am: 97702b68 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie1a457e1cb018ea2839302ed57593c473e3cfa47