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