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