Merge changes I42956a9f,I92f7c559,I5af62590 into sc-dev am: 826719dee4 am: 480c182ae9 am: 086f4c9526

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373120

Change-Id: I4095801191f2f714fc44ae66e25771f677c57530