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



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