Merge "[automerger skipped] Merge "uninstall Test App" into rvc-dev am: 3613fe738f -s ours am: 523cc520d0 -s ours am: d054fb01aa -s ours" into rvc-qpr-dev-plus-aosp am: afda211be2 -s ours

am skip reason: Change-Id I75aa7e1ab13f2ddddeaa7e1826bc8a6356759547 with SHA-1 f49dc8bc94 is in history

Change-Id: I759ed23a260f5efb7d83cb5110027a938fc64490