Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev...
Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev am: bba1891e am: bbd8452e am: ab45f1c0
Change-Id: I1b2488487d2e36faa3564e410fa577585bf669ea