Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev am: bba1891e80 am: 248a3e7c98 am: 7c1cc181fe am: 1c38872df3 am: 094fd6068e

Change-Id: I7b0a68cf3bc0ad7578e9bb0c848c9b82a7d17021