Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: 3b012860db
am: 71a351af08
Change-Id: If29f26ebf90a856663849327e0a2d167e2cc16a0
This commit is contained in: