Merge "Invalidate existing keys when platform_key_generation_id is set" into qt-dev
am: 0307878613

Change-Id: I7f3c63a683954ec6f2e4d7159d364037efbbe4cc