Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21910522



Change-Id: Ifdc9a8c50e6a0f7e91f8104e2bb31d34ed770655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>