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