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