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



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