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