resolve merge conflicts of 530cbe4 to nyc-mr1-dev-plus-aosp am: ae7178e43a
resolve merge conflicts of 530cbe4 to nyc-mr1-dev-plus-aosp
am: ae7178e43a

Change-Id: I89a6424e29fd6ea73b77d7a6973ae70121efa749

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