Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19603443 Change-Id: I225c0ae9494b996f13631b0c8723da735ea64637 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>