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

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

Change-Id: Id30a1485b8c3e877e0a4ddf1d28e5d3bed06c629