Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am: bbfdf7ad23 am: 54a0faa37b" into nyc-mr2-dev-plus-aosp