Merge "APM: use the device profile to update dynamic profiles." am: 07ab1dc390 am: 44cadeaefd

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

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