Replicate aosp/1185832 in ui/ project to finish fixing b/141364941
Replicate aosp/1185832 in ui/ project to finish fixing b/141364941

Bug: 141364941
Change-Id: I529390a240ec6fda441e796dfe22a37328be3df7
Test: ui/gw bOS run 100 times

androidx/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx