Merge "Pass app version to agent in adb restore for kv." into pi-dev
am: 133f93bbbb

Change-Id: I8c16ca2f13a7c03fd754928422b736658a53f779