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

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

Change-Id: I892f9bcdaa0b705d00f2a2ec742c9b3998366afa