After updating Android Studio to 3.6.1, the following lines get added in Project.xml in .idea folder.
<AndroidXmlCodeStyleSettings>
<option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
</AndroidXmlCodeStyleSettings>
This file was previously added to git and pushed to GitHub so locally adding to untrack is also not helping. Upon doing so, it is staging it as a new file during the next time I click commit option in VCS tab.
I found here that it might be due to the NDK support plugin but even disabling it is not working.