Revert^2 "Update the ambient indication container"

Includes extra check for null ambient indication container

6f0a40f36b4a676f14713438823ba009437a21de
Bug: 206122454
Change-Id: I0acdf3ba6bbd447033d7bee2a859eb2bc1c988fc
4 files changed