Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
tree: 2c0a087ba24fa34024911789e4f8f4f8e21aacc4
  1. core/
  2. services/
  3. tests/