Merge changes I7dde7eb7,I7a3f7fa1 into oc-dev

* changes:
  Updated NanoAppBundleTest to skip when AddAccountSettings can't be found
  [RESTRICT AUTOMERGE]: Updated NanoAppBundleTest to work with Android Auto Embedded.