Merge "Include androidx stubs in framework docs" am: acd388baf2 am: 5c239c7e95
am: ecf64ba3c4

Change-Id: I8b7f2e1e303b7add21e8eee9fa16f29a14177d55