[automerger skipped] [DO NOT MERGE] Fix layout for errorprone build am: 79709cfb41 am: 405bebefac -s ours am: 73280e0c91 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713 Change-Id: I9a5dd97cf36690ff6b4435a379063a6841f9e5d5
This commit is contained in: