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

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

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