Revert "Update baseline files due to bug fix in Metalava"

This reverts commit de97983046a42491aaac314ebb83544f9e502606.

Reason for revert: Too costly to update baseline files due to conflicts

Change-Id: Ib5cbc86f1a8085bcfa08d56a4d56a19994587f32
4 files changed