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