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: bd8b271f -s ours am: 3d011ccf -s ours am: 7b9f10fb -s ours am: 1f634bea -s ours" into sc-v2-dev-plus-aosp am: ba2a0d46 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6a08ebcd04433fa3b5e553738653229dcde009af