Merge "Extract flagged APIs in the nested classes." into main am: f5d3064cee am: ff31098b78

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

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