Merge changes from topic "revert-1553275-Bug139327211_V5-QZELUAZXGW" into sc-dev am: eb1c29d6bb

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

Change-Id: I49d49cfdd67994234d9eacf338d6275e796df91a