Merge "Add AudioMetadata keys related to active audio presentation" am: 2c27a78902

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51e96f85fff3f51a9b2eec8faaffaaabdd91690f