Merge changes Ic767aeb6,I2aef40ef into sc-dev am: 2a3cde8157 am: f092b88a25 am: ca6441ca35

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

Change-Id: Ia4d9762e8e0a72ca1e0354226a8a67daf743b558