Resolve merge conflicts of f0911040 to nyc-dev

am: 23cb6da6

* commit '23cb6da6': (67 commits)
  Deprecates/deletes 10 outdated wear samples identified in go/cleanup-wear-samples signed off by Wear team.
  Fixes the broken build for NavigationDrawer sample. (No resource identifier found for attribute 'layoutManager' in package 'com.example.android.navigationdrawer' in the layout xml file)
  Adds missing .gitignore files for Wearable and Shared folders.
  Update all google play service dependecies to use the latest version and update suppor libraries.
  BluetoothChat: Fix crash on disconnection
  Camera2Video: Add comments
  Camera2Video: Several fixes
  MediaRecorder: Merge a pull request
  Fixes b/26503965.
  Camera2Basic: Fix JPEG orientation on some devices
  Adding extra instructions to make sure developers enable the Fit API in their project before running sample.
  Redundant call to method (removed).
  Update Gradle Wrapper version to 2.8
  Add RuntimePermissionsWear to master build.gradle
  Removes unnecessary permission PROVIDE_BACKGROUND from wear samples.
  Changes one wear sample to use default priority for data item, since that is the default.
  Fixes incorrect spelling of variables.
  Add setUrgent call for DataLayer changes in GMS core.
  Moves RuntimePermissionWear sample from devrel repo to mnc-docs repo.
  Update DisplayingBitmaps sample to hide loading spinner on detail view.
  ...

Change-Id: I8d732ac4a0516560696c0a35e3d35351e92a3fee