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