Merge "AudioService: fix capture policy restoration" into sc-dev am: 0dee5545 am: a3a9dbe1 am: 11caa03d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15178916

Change-Id: Iae8b304e2f7c2bd6be7a44c919a71673a021b13c