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