Merge "Provide isLocked to wallet instead of isUnlocked" into rvc-dev am: c9ffc840f5

Change-Id: I8339dde549e192665600985fdf274d4fe57a3f5f