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

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

Change-Id: If80eaee23851301a7f64faa0b879090671fffb25