Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev am: bba1891e80 am: bbd8452efe am: ab45f1c01d am: d27f9f6d9b

Change-Id: I530981b4a6898119ada63854075febddb058fad5