Merge "Request rollback resistance for FBE keys." am: aae52f4816
am: 0b895c13bc

Change-Id: Ic3ad961ae342d65dd86bc7fd6a06201d55101eba