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