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

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

Change-Id: Ie8e65f6a2cd369d20e10f20fff88d5387455ae4c