Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev am: bba1891e am: 248a3e7c Change-Id: Ia22d40168dbf63e4c08c9f58b9874802751c64a6