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

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

Change-Id: I11c09f293ef86ebfe0b246ce8b4126a1b8768792