Merge "Add cts test for extra location controller APIs." into rvc-dev am: 797c59634e am: c0abc1ed8d am: bd4dd9b3de am: ed1e981259

Change-Id: I6f4a8b379784bfc9465010b7a1b23e5a80461506