Bug: 266854800 Test: Verified by changing flags using adb shell Change-Id: I29a8b581c9edb21ed4a7204c33f0e5fe8eef51b9
0fe7e089ca
a7d7c64037