Merge "Remove AA+ decorator logic from aosp code" into sc-dev