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