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