Android 6.0.1 release 11
Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 am: 740e072600 am: 7390f09a40
am: 755d0a2d63

* commit '755d0a2d63e447a4d6d48be72627e446513b26b9':