[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-1553275-Bug139327211_V5-QZELUAZXGW" into sc-dev am: eb1c29d6 am: dd3dd52b -s ours am: 8c85417d -s ours

am skip reason: Merged-In Ic83ad85441d310aa272b462f8b5c46735c6378b5 with SHA-1 865150b6 is already in history

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

Change-Id: I8d97f836cbf863bc2b5fbd534a8bfd5422b2b09d