Merge "Revert submission "Introduce a mode for HWC2 to talk to HIDL graphics HALs directly"" am: 631888eada
am: 400038c4c2

Change-Id: Ibcce9aab312fe254320a363af2fd4b034b6bddbf