Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev am: afccacad68 am: 829c45d5be
am: deb3516131  -s ours

Change-Id: I253cc1415c43facdb2252d4b2f57fc9c682db43f