DO NOT MERGE ANYWHERE Manually Cherry Pick AOSP change to resolve conflicts. https://android-review.googlesource.com/#/c/151358/
DO NOT MERGE ANYWHERE Manually Cherry Pick AOSP change to resolve conflicts.
https://android-review.googlesource.com/#/c/151358/

Change-Id: I190eeb8f17d29eb451e741ce7e11f61c95c66f1e

androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,androidx/androidx