Merge "Deprecate permission tree APIs" into main