Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: ea39f74a42
am: a7f215cce2
Change-Id: Ic62d4858cc3ae4643dc020cc9c9846df3e88d2c4
This commit is contained in: