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