[automerger skipped] Merge "Handle some diag-related denials." am: 63b4c05de1

am: 83ccae8028  -s ours

Change-Id: Ifb3ef29a25c254de5bf9ffc054787eba876c4bef
This commit is contained in:
Joel Galenson
2018-04-13 14:01:33 -07:00
committed by android-build-merger

Diff Content Not Available