Merge "APIs in a nested class can be flagged by outer class." into main am: a484783a

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



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