Merge "RESTRICT AUTOMERGE Note RECEIVE_AMBIENT_TRIGGER_AUDIO in the SoundTrigger" into tm-qpr-dev am: e63195b6d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191757 Change-Id: I4d8aa1b7123f40080c57ae7704b3df8e025f236e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: