Merge "Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d455 am: 7f8eabf3" into rvc-d1-dev-plus-aosp