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