[automerger skipped] Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev
am:1ed27213d0-s ours am skip reason: change_id Ic85181abb3edd4c77c427faefa4cd6b9c35b498f with SHA11946d87344is in history Change-Id: Ifd77e79fc398dc8d0839764f9768079ae26bd391
This commit is contained in: