Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main