Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev