Merge "Merge "Adds restore/setup specific dex flag" into rvc-dev am: 299a2511 am: 3f986577" into rvc-d1-dev-plus-aosp