Merge "Merge "Rename ANR -> Anr to conform to code style" into rvc-dev am:...
Merge "Merge "Rename ANR -> Anr to conform to code style" into rvc-dev am: 61ac9f94 am: 0182e8a3" into rvc-d1-dev-plus-aosp am: cb5e90c5
Change-Id: I487fe7f4cbd555b906124c42d378d354ebc81ee9