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

Merge "[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f -s ours am: 8cd46479 -s ours am: 96254f92 -s ours am: 576965b0 -s ours am: b4b5f780 -s ours am: 92f40387 -s ours am: c73aeac5 -s ours" into sc-qpr1-dev-plus-aosp am: 42057af3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I04291df253e0fa33fac7d243ef7ed4466d5fe7c3