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: 248a3e7c am: 8a8456aa
Change-Id: Ic0a276ab824ce75eee3560392de4338db3158e6f