Merge "Install etc files with VSDK" am: 53f2c95791

Original change: https://android-review.googlesource.com/c/platform/development/+/1781807

Change-Id: I9fa237514b6ebe7b1c380f272183c7da9a89d962