[automerger skipped] Merge "[Media TTT] Hide the chip if the user taps the screen." into tm-dev am: c7170489 -s ours

am skip reason: Merged-In I3951d0bbb3a04d5b82a54339a548b4e293bbf527 with SHA-1 4e3e7af4 is already in history

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

Change-Id: I49bb36a44228d8d1ed853f2209e47ca9c25efb48