[automerger skipped] Merge ab/7633965 am: 2f985162ca -s ours am: 3ce01d0da1 -s ours

am skip reason: Merged-In I3ef19b77bc33546a3e80bca75532d017b4712054 with SHA-1 d7e56f5b96 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547112

Change-Id: I1b37ddc201246389e2d30cc678c7416c362d5db9