resolve merge conflicts of 8fb40bb to nyc-dev-plus-aosp
resolve merge conflicts of 8fb40bb to nyc-dev-plus-aosp

Change-Id: Ie6ad6680b76abfb882189853a2e43213b76162fd

AndroidX/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,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,AndroidX/androidx,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,AndroidX/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx