Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev am: 5a3a3f22 am: c47f8abf Change-Id: If08be88c04f57f3a5ee802d0a54738dd1a07318f