Merge "Fix code issues in APM found with unit tests" am: 47f6a73cd2 am: d5a6361210

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

Change-Id: Ie7dce94410f7144a602c3d5ac92d73843e596628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>