Merge "Fix: some flagged APIs are not recorded." into main am: 9750a10449 am: e9d3847cb9

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

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