Merge "Do not let NFCC manage RF configuration when in reader mode"
am: 3a991415bc

Change-Id: I53a08296967c9f44b065e94a20926b647f724b57