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