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



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