[automerger skipped] Merge "Create DreamManager System Server TestApi am:...
[automerger skipped] Merge "Create DreamManager System Server TestApi am: 641e2e63 am: 484225b6" into rvc-d1-dev-plus-aosp am: 4e85622b -s ours
am skip reason: Change-Id I937061138bc8ccaf4475674f00331c3fe1c5a495 with SHA-1 641e2e63 is in history
Change-Id: I4ae8b60b990f63bdc54ddc85bdf58a9d9f00333a