Merge "Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main am: 7c3428237e am: 208b9809e8 am: ae76894604" into main