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