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