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