tree 71a0b17d9dd7bebeaee196be9c1347d42f288c98
parent 865efafcb52d6d2c0c819eeb5fe80ac4dcf6695d
parent b1060eb9f520ba0f89dd8a71dc7c178e2b0c1929
author Andy Hung <hunga@google.com> 1618964917 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618964917 +0000

Merge changes from topics "360RA channel mask", "audio channels" am: b1060eb9f5

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

Change-Id: Ia821a6b7b843569acc9797d1806beed84a615071