Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev am: d95fc2d4c9
am: 5bf4bbea8e

Change-Id: I1e8cb959c31cd4feda3d53414fbc283126df19ca