Modify inflation of ambient indication area to handle merge layouts

Bug: 290652751
Change-Id: I4c28b26250103ec93ff48ac2268d4f71160d1ea6
1 file changed