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

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

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