Merge "Swap LF_T3T_FLAGS bytes for PN548" am: a5e3f072ce am: 9d79b4eac3
am: 2779293aa9

Change-Id: Ie66bbbeb2904eb5415bff36636c6b3c869f4d5a2