Merge "audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced" am: 74e618ff8b am: 432f868e78

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

Change-Id: I9af7417eb8b65d6e0c4526882fe16a4e8de6df78