Merge "Reduce AAF auth permission cache time to 5 mins"