Merge "Merge "do ae/awb based on Camera capability" into nougat-cts-dev am: 4a1650647f" into nougat-mr1-cts-dev
am: 6b1e9426b1

Change-Id: I42e26a4d8602b2513820c5fff5d56fd46f609364