Merge "Ensure inner classes of @SystemApi classes are kept" into main am: 663e2aaa56

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

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