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