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: 7380c153 -s ours am: d5b36011 -s ours am: 2159ba8c -s ours am: 0f553a5f -s ours am: be3551ed -s ours am: 1fabf50d -s ours am: 49c8cdb8 -s ours am: dff63c57 -s ours" into sc-qpr1-dev-plus-aosp am: abf18635 -s ours am: becc8196 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7856e89c650612503d25fbc6a922e08242b7023e