Merge changes from topic "nested-interface" am: 254d9b3f65 am: 5f85eb1d78 am: c64a0ba936 am: ecaefda9b2 am: a2f992a0b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1878150

Change-Id: I70316ccbea02dfb1f85d551052702897a0106103