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

Change-Id: I1897900ed10da2adcb49f144b549044f46e530ba