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