Merge "Remove checked in mkstubs .idea directory" am: 66e859ab9b am: 607fb95dd7

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

Change-Id: I5a2710decaafeaf4da9d114de9cfa28df80916a9