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

[automerger skipped] Merge "Note RECEIVE_AMBIENT_TRIGGER_AUDIO in the SoundTrigger" into tm-dev am: 7a9cf44c am: 454a68f4 -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: Iaf7fe98a9eabf056a21cb2edef779a2beb6bbe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>