Merge "Framework: Disable [MissingOverride] for platformprotos" am: 4eaa22f24e am: 1c14209950
am: 63f4ea33e7  -s ours

Change-Id: I6672dabe7fdda3599b385b4cf34e7a649123479c