Merge "Simplify handling of nested classes" into main am: b983c5bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3155546



Change-Id: I0a10f83d64c4a82de05257c7b437a994f363cbce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>