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

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

Change-Id: I514d05b6f399fc31aeb9c5d814fcadff61acdfca