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