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

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

Change-Id: Ie9af3eff2c933b7195bd5798cbf160f92987d5da