Merge "Add custom Error Prone check for rethrowing." into rvc-dev am: 971448afb6

Change-Id: Id83c8866894839ab3042935b38381dcb947b5386