[automerger skipped] Merge "Update keystore to use KM4.1." am: c0ef4595c8 am: 840fd26eb0 am: de4f404080 -s ours
am skip reason: Change-Id Ib7486aad46c144471a1607eec31b8df1059a511d with SHA-1 611f090cd1 is in history

Change-Id: I7b743a4ca9f2e1000f22a9532fe40a51c0998532