[automerger skipped] APM: Fix config de-serialization am: 8916ae92 am:...

[automerger skipped] APM: Fix config de-serialization am: 8916ae92 am: c951bc11 am: ff632304 -s ours

am skip reason: Change-Id I98c21ab03d869eb5f4259ea12cd433632cf6da5d with SHA-1 946c0035 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic592d2b650b89da270ad3d389490e765df856c7a