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