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