Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd am: 2804d872a3 am: 3a78862c00 am: b74b5dfe38 am: df295c1d15

Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1426791

Change-Id: Ib01376f4eb97258842260d10940460e70d464873