Merge "Fix RF stuck during reading ISO15693 tag" am: 6e6e6d8151
am: b02db1a506

Change-Id: Id016c17b53d5f2d15534b31a3a624caa7fcc9727