Merge "Add uses of hidden APIs from vendor apps" into pi-dev