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