Merge "Use per user method when writing or reading Live Caption secure setting" into qt-r1-dev
am: 5191f05791

Change-Id: I0af6985b222d5cc3608e568dd5ed1b6a007cbd2c