Merge changes from topic "revert-1658450-HONDOEPHGR" am: 9888047526 am: 7273b2933b am: 67247a2d84

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

Change-Id: I034c24565e3a9d869adfac4733c54980943d6054