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