[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: 76543471 am: d61e0231 -s ours
am skip reason: Change-Id If5a7bd88728054e50aaacee138d9ae78513e94fe with SHA-1 dddc9f50 is in history
Change-Id: I2ca8ad816df60f59b7c3ecd610f80d97a0f1999c