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