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