[automerger skipped] Merge "Support DisplayAreas in protos" into rvc-dev am:...
[automerger skipped] Merge "Support DisplayAreas in protos" into rvc-dev am: ae062e92 am: 174c1aca am: edc7cc74 am: 61d3ea34 -s ours
am skip reason: Change-Id If5a7bd88728054e50aaacee138d9ae78513e94fe with SHA-1 9dfb386f is in history
Change-Id: I6a2fa9744ef58177685a06bb58b209156fead096