Merge cherrypicks of [18143360, 18143563] into studio-dolphin-release.

Change-Id: I61389521556747df5c69a429b115a2242ed496df
tree: 1c7a9925f6126567072b72ec368d4856246ae907
  1. .idea/
  2. adt-testutils/
  3. adt-ui/
  4. adt-ui-model/
  5. analytics/
  6. android/
  7. android-adb/
  8. android-common/
  9. android-kotlin/
  10. android-lang/
  11. android-lang-databinding/
  12. android-lint/
  13. android-navigator/
  14. android-npw/
  15. android-plugin/
  16. android-templates/
  17. android-test-framework/
  18. android-test-retention/
  19. android-transport/
  20. android-uitests/
  21. androidx-integration-tests/
  22. apkanalyzer/
  23. app-inspection/
  24. artwork/
  25. assistant/
  26. bleak/
  27. build-attribution/
  28. build-common/
  29. codenavigation/
  30. compose-designer/
  31. compose-ide-plugin/
  32. connection-assistant/
  33. dagger/
  34. databinding/
  35. debuggers/
  36. deploy/
  37. design-plugin/
  38. designer/
  39. designer-perf-tests/
  40. device-explorer/
  41. device-manager/
  42. emulator/
  43. gradle-dsl/
  44. gradle-dsl-kotlin/
  45. gradle-dsl-toml/
  46. gradle-tooling/
  47. ide-perf-tests/
  48. inspectors-common/
  49. intellij.android.compose-common/
  50. jps-model/
  51. jps-plugin/
  52. kotlin-integration/
  53. layout-inspector/
  54. layout-ui/
  55. layoutlib/
  56. layoutlib-loader/
  57. lint/
  58. logcat/
  59. manual-tests/
  60. mlkit/
  61. native/
  62. native-symbolizer/
  63. nav/
  64. observable/
  65. observable-demo/
  66. observable-ui/
  67. old-agp-tests/
  68. profilers/
  69. profilers-android/
  70. profilers-atrace/
  71. profilers-ui/
  72. project-system/
  73. project-system-gradle/
  74. project-system-gradle-models/
  75. project-system-gradle-psd/
  76. project-system-gradle-repository-search/
  77. project-system-gradle-sync/
  78. project-system-gradle-upgrade/
  79. room/
  80. rt/
  81. sdk-updates/
  82. searchable-options/
  83. server-flags/
  84. smali/
  85. studio/
  86. studio-updater/
  87. swingp/
  88. sync-perf-tests/
  89. transport-database/
  90. uitest-framework/
  91. ultimate/
  92. updater-ui/
  93. utp/
  94. wear-pairing/
  95. whats-new-assistant/
  96. wizard/
  97. wizard-model/
  98. .editorconfig
  99. .gitignore
  100. get_aosp_changes.sh
  101. icon-robots.txt
  102. README.md
README.md