Merge "Remove checked in mkstubs .idea directory" am: 66e859ab9b am: 607fb95dd7 am: 6669d4a4dd am: 85be9d5466

Original change: https://android-review.googlesource.com/c/platform/development/+/1921070

Change-Id: Ic26f06b46de5b8782a2776e7b744ad829b8727ba