Merge "Ensure inner classes of @SystemApi classes are kept" into main am: 663e2aaa am: 761bbe3c

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



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