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: Ia06b4166a89f7a0b7227340d5f8eb8e3d52d1154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>