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