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