[automerger skipped] Merge "Use sdk_version: none for platform stubs" into rvc-dev am: a31590bb4a am: fa0599c645 -s ours

am skip reason: Change-Id I5f1b01875b0073f942c692882db157a8c5788ce0 with SHA-1 87c7d28881 is in history

Change-Id: I80ae334714b98998cc94a7652520e61de93f82f0