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