Merge "Add hidden API to check support of Multi-Display" into oc-dev am: 4eab3cb11a
am: b7c802094b

Change-Id: Icb5882f5e6e5b1a8054a8bd9889d46fc403bee98