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