Fix HDR+ force closing

Change-Id: I55d2ca3430d314a36311ebfc02a1f0d8ee513d94
Merge "Fix HDR+ force closing" into lollipop