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



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