Storing form factor as part of backup and disabling restore if form-factor is different

Bug: 195301649
Test: Manual
Change-Id: I9a9c4bc9246f40af2209cb914b3966319bc78bff
10 files changed