Merge "[automerger skipped] Merge "Note RECEIVE_AMBIENT_TRIGGER_AUDIO in the...

Merge "[automerger skipped] Merge "Note RECEIVE_AMBIENT_TRIGGER_AUDIO in the SoundTrigger" into tm-dev am: 7a9cf44c am: dababa49 -s ours am: 28438ab7 -s ours" into tm-qpr-dev-plus-aosp am: 17ca2a9d -s ours

am skip reason: Merged-In I6d63c99e2d31e3f668070ac82afed71ff6672c9e with SHA-1 bd934eba is already in history

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



Change-Id: Ib6abf81e54821d0fcf8ea02f7696d1d1280bcd04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>