Merge "Add feature android.hardware.felica to PM"