Merge "Extract flagged APIs in the nested classes." into main am: f5d3064cee am: f887ecf280 am: 4ea2176370

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

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