resolve merge conflicts of a92497edcb3dc60e1ce0912874f7aee9a7b7ca97 to androidx-crane-dev
resolve merge conflicts of a92497edcb3dc60e1ce0912874f7aee9a7b7ca97 to androidx-crane-dev

Bug: None

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifa7b926e387eb731a86af2da32ddaf9234e6b871

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