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