[automerger skipped] Merge "[DO NOT MERGE] Remove taps option from screen...

[automerger skipped] Merge "[DO NOT MERGE] Remove taps option from screen record dialog" into sc-v2-dev am: 3a2fe51e am: 5977c2c0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I34369508c2807fdae33539cae1a866beee7bc637