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

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

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