Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713 Change-Id: I11ca399521a10ff9d461ffe5b7cd54e3329fd7cb
This commit is contained in: