Merge "Merge "aacenc: reduce logspam for timestamp mismatch" into rvc-dev am: cd6719411b am: cc0951734d am: 403a3ce160" into rvc-qpr-dev-plus-aosp am: 2c23b3744f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11961846

Change-Id: I375df2c5e71213267984af8eb08c6b32ff49d400