Merge "Merge "Removed the darkShelf logic" into qt-dev am: f3bf364998 am: 0024824280" into qt-r1-dev-plus-aosp
am: dd3bd3e2f9

Change-Id: I9eb1cb6dbf94758334af357cd32f4883d793cc47