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

* commit '7390f09a401d9553f9c3b5ccc4e8418be8bd899a':