Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23631337 Change-Id: Ic10c3ef0d7421fa9664d6d234310d57982b09ff0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>