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

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

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