Merge "Simplify handling of nested classes" into main am: b983c5bc5f am: 48f21ec987

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

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