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