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