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