Merge "Merge "Merge "Fix Magnification Settings didn't restore via D2D...

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

Change-Id: Ic9cf4e245eb35c9bfb51781fb8fa5bdc09298b1e