Includes extra check for null ambient indication container 6f0a40f3 Bug: 206122454 Change-Id: I0acdf3ba6bbd447033d7bee2a859eb2bc1c988fc