Merge "Make non-updatable stubs depend on sdk 29" into rvc-dev am: d42b7dd9df am: 5d06991b69

Change-Id: I14fab1054a9447b265c68e66e8501164cdc9d51f