Merge "Fix Accessibility Menu setting is not restored by D2D" into rvc-dev am:...
Merge "Fix Accessibility Menu setting is not restored by D2D" into rvc-dev am: 023b83c8 am: c4d96fc0 am: 4fd4447b am: 43d30aa2
Change-Id: I17a85e6a1e8fd262dddf3dd1cd9c420ab4afa212