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